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

* commit '1a423b2ee7c43b802977983d50d425db227386c1':
  sdcard: ensure installd fs upgrade has completed