Merge commit 'cb8b5af' into nyc-dev-plus-aosp