Merge "Carrier ID table rollout" am: 377714970b
am: 7b27727e54

Change-Id: Ib494e5bd8df37918f462ec28a1337e54199f1b05