Merge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1...