Merge "address carrier id api review feedback" am: 2f6b2726e6
am: e6211a5f01

Change-Id: I3e601111b7da73158cf1ce281abd77b6d5cfc68f