Merge "Fixing sync in Car(Sensor|Diagnostic)Manager" into oc-dev