Merge "Fix the red build." into oc-dr1-dev-plus-aosp