Merge "support carrierid provider update from OTA"