Merge commit '5bb9b8b' into nyc-dev-plus-aosp