Merge "Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD" into nyc-mr1-dev-plus-aosp