am d89e39c6: am 504b4e9c: Merge "sdcard: ensure installd fs upgrade has completed" into lmp-dev

* commit 'd89e39c6f39c035f37acb3e089e94b8f9f38edf4':
  sdcard: ensure installd fs upgrade has completed