Merge changes from topic "carrier_id_aosp_cp" am: c38d7c37dc
am: 56d7e82df9

Change-Id: I83a8a4071d42ca415c6f267f1e668796ab14890f