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

Change-Id: I1ffab9bd15e53e243a9a2ad9ac918c73f6b0cff8