Merge "Add corresponding error code to fix vts test" into oc-dr1-dev
am: a20caf7720  -s ours

Change-Id: Ia6bc616f91773496324f3e4a4bf3d01551519ff4