Merge "Merge "Fixes on handling messages from apps to host." into nyc-dev am:...
Merge "Merge "Fixes on handling messages from apps to host." into nyc-dev am: 60f2c17e am: b79fe0f9" into nyc-mr1-dev-plus-aosp
am: 56dc57b2
* commit '56dc57b2':
Change-Id: I70f51472d2a1afdf1516863d05f052e7d2f0daf8