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

Change-Id: I1f680d72b6a2d7730e081574aaac04f5e802c831