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

Change-Id: I98205a431af725626f8f692d9b69d4c4c1f6fe5b