[automerger skipped] Merge "A test api to override carrier information" am: 869a9357f3 am: a9e915f6f7  -s ours
am: 69e50ed439

Change-Id: Iec8dde3fc7512eac2ef6fa9d5e7e416fa5349ac4