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

Change-Id: I0291098331abacfd48a479d00ef61e52110037c2