Merge "A test api to override carrier information" am: 420ab92b0b
am: 700b21d7cd

Change-Id: Id71dd0534b784d757bde6cd8ca88f3eb35aaf007