Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
am: 238eaf5183

Change-Id: Id49766c04ddfe89a28c37360c35959ff2a4a329a