am 6363adeb: am 1a423b2e: am 66083ae8: Merge "sdcard: ensure installd fs upgrade has completed"

* commit '6363adebc08b60ef68cdc1efdd68e495ecc88892':
  sdcard: ensure installd fs upgrade has completed