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