Merge commit '6a5fa76' into nyc-dev-plus-aosp