Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev