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

Change-Id: Ic092adf7ae14b10ef56aa97d1d37a69c62ce1422