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

Change-Id: Ic5797fd2047010ee054b7aff199f490569efa3f3