Merge "support query & update carrier id for current subs" am: b96c5ae37b am: f9d037cb3e
am: 285edd6e77  -s ours

Change-Id: I2beafcf3761e00d9946974fbe59532b799302c52