Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into oc-dr1-dev-plus-aosp