Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf
am: 8463ad7760

Change-Id: I7a26c82c978706bc5a522af3ed2b9e2a96ec0fb6