Merge "Merge "Merge "Cherry-pick 7ad1110e" am: 6fd06712 -s ours am: 1ebe18d6 -s ours" into oc-dev-plus-aosp am: eb20c5a9 -s ours" into oc-dr1-dev-plus-aosp