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: 7bfe63eb
* commit '7bfe63eb':
Change-Id: I3779d149643410ac8f007f888a1fcf0bf0813905