Merge "Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06" into nyc-mr2-dev-plus-aosp
am: c8cdab674d

Change-Id: Ib9f015023960c584c3b09dfbf68454f358660671