Merge "Fix test failure" into oc-dr1-dev am: a9c3d283df
am: b134394271

Change-Id: Icbdf3491c2e4abca258e9a4791da0861a8a8c805