am 9e2d1ed8: am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev

* commit '9e2d1ed898b8e4a4971ddb511e221e3406bf797a':
  Actually wait for installd