Merge "resolve merge conflicts of 7a2ff82b29 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp