Merge "Add error code to VeiclePropertyStore."