Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours am: 1ebe18d691  -s ours am: 8f09557150  -s ours" into oc-dr1-dev-plus-aosp am: 165f684a63  -s ours"