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

* commit '60f2c17e273ea919dc663f387ef246b3d359c412':
  Fixes on handling messages from apps to host.

Change-Id: I74c228a47a8daac689972d5b3742d3caf74d12c2