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

Change-Id: Ie437e57634525c36087f5255934d02c49b42c37c