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

* commit '504b4e9cc93abbcd115c72e7b2707d73df442090':
  sdcard: ensure installd fs upgrade has completed