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

Change-Id: I8aaea99f30611ae8b3fafa95c07f2d292ec39eb7