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

Change-Id: I8f854a94599c2ef407093859da15abd7d12adae9