Merge "Merge "Fix broken test" into oc-mr1-dev am: d8e7cb4b47" into oc-mr1-dev-plus-aosp