Merge changes from topics "msim_tests_fixes", "redial_emer_phone_account" am: 8823dd0a36 am: 552799c7f9
am: 258efa1829

Change-Id: I9d01ea6f88b9c7205d2f512bc9eb6ca6c18823ee