Merge "a new folder to store OTA carrier id update" am: 76adcdf688
am: df482d03ad

Change-Id: I6e8b05ff44279f73032dfead0e7a5b1e89bfe2af