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

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5