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

Change-Id: I20dcbef58dfb44fd1100c37f41eeb77be24ea9af