Merge "improve the testability of carrier id ota"