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

* commit '0633ae7481045b96da09a6c9e1b360d79433a151':
  Actually wait for installd