am 117faced: am 1cc86956: Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev

* commit '117faced25861b39abac90dc284981efcca811c2':
  Fixed an inconsistency when booting up with SIMPIn