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

Change-Id: Ia2d9c09ae3085cfd8825bb25dec738d6404c1d0d