Merge "Merge "resolve merge conflicts of b9d266ff to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: e61d3ff3" into nyc-mr1-dev-plus-aosp