Merge "update carrier id list to version 5" am: d96849b747
am: 9847b108af

Change-Id: If4fe461616ffaa9ffb80a657ebc1aa17c9e6cdfd