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

* commit 'b96bc804169e13701fa249e0a3b3c08d3f2e9808':
  Actually wait for installd