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

Change-Id: If8e124e4ea27e6d61a02fd594352d451f72140a2