am f7bf24ad: am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev

* commit 'f7bf24ad1d780b326287409f37e0e8c03115f60d':
  Ensure host is set before onInflate()