Merge "resolve merge conflicts of 3fb651b to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp