Merge "add null pointer check before installing ota carrier id" am: 121360885b am: a7cc9ef8c1
am: 92221b562d

Change-Id: I1083e038eb017539234630bf5edad1a7e57b7d17