Merge "fix carrierIdentifierTest"
am: c94b4e7a19

Change-Id: I8d0dd8ce20a7b57924009863b680d567139d4480