Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06
am: 2f31f105e6

Change-Id: Ibc4d546a7903212444985e256361ec6d870b3684