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

* commit 'b79fe0f9f5644ebe9f12b7edb99efc3e393884b9':

Change-Id: Id47038592bbde48af42124b0046892222bb7399a