Merge "Merge "Fixes on handling messages from apps to host." into nyc-dev am: 60f2c17e27 am: b79fe0f9f5" into nyc-mr1-dev-plus-aosp