Merge "A test api to override carrier information" into pi-dev am: b71c76036c
am: 1a1b0608ca

Change-Id: I65560ff163717b050c124fc0ff28a8958440f2b0