Merge "Initialize paths for health 2.1 + batteryCapacityLevelPath + batteryChargeTimeToFullNowPath" am: 0e7081d5ed am: 32234ee7fa

Change-Id: I703f8c4f40c0a53080dd7b886eef5efa9925081c