Merge "GSI: add the messaging app" into oc-mr1-dev