Merge "A test api to override carrier information" into pi-dev
am: 6e2469a99d

Change-Id: I98ab772af3bff068292184aa78f045746a712c02