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

Change-Id: I47d667239c7a699d3b77a42ebbf08c5cd12f90ac