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

Change-Id: Id1caf3f5d802843be0b0a51f234bceef5fbd9695