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

Change-Id: I2eb4c69121e7635c885eca227b1eb3eea13fe13f