Merge "Make CarPropertyManager public"