Merge "Merge commit '8f80b6fd9cbffb3d43f038355623e60608d46833' into manual_merge_8f80b6f" into oc-dr1-dev-plus-aosp