Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2 am: 2a047b9ff3
am: 5612006f31

Change-Id: I48ffce296309d61eba7cc5710a8537d708ff68f3