Merge "address carrier id api review feedback" am: 2f6b2726e6 am: e6211a5f01
am: 5871db10a5  -s ours

Change-Id: Ib8ed3e8eeeb1126351409d5dadb5a021b851540f