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

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