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

Change-Id: I587918b2cd00256bfd0832a13d427f4ba616735e