Merge "Merge commit '3fd83afc828a36b085bae1e34bae2e5bc4fc7947' into manual_merge_d94b1e6" into oc-dr1-dev-plus-aosp