Merge "resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp" into oc-dev-plus-aosp