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

Change-Id: I5697df0de7367aacf4e1765c241e4311a9b293b5