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

Change-Id: Ibbec4701dca82d9c271e8ff25d25cbe2df8da816