am 66083ae8: Merge "sdcard: ensure installd fs upgrade has completed"

* commit '66083ae834374074047f0eff41e80999660d4af1':
  sdcard: ensure installd fs upgrade has completed