Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp