Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev