Merge "[automerger skipped] Merge "expose Carrier Id related APIs" am: 18b925a7 am: 0031ae81 am: 31cf6473 -s ours"