Merge "A test api to override carrier information" into pi-dev