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

Change-Id: Icd3c2ddc0e4ca02fef57142097c54932c04b391a