Merge "Merge "Get the correct operator name" am: 297e9f9a am: 2232ac8c am: 18a0e81a" into nyc-mr2-dev-plus-aosp