Merge "DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0' into oc-dr1-dev am: ca136cdd -s ours am: 6894961d -s ours" into oc-mr1-dev-plus-aosp