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

Change-Id: Ifce815fa63555077491847c4c2f24bf1da275210