Fix failing SIM import test am: 8e9e782cb7
am: 7c0a5c5c93

Change-Id: Iebf7b079680979d0a850027da819e554b3ee4834