Merge "Carrier ID table rollout"
am: 377714970b

Change-Id: I4f30ff15d3a5c26718e021a8f06b0276308f0bfc