Merge "Add corresponding error code to fix vts test" into oreo-vts-dev