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