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

Change-Id: I39238ce6a796bc6981b77ec361f384f0f3f4d173