Merge changes from topic "health_charger" am: 056ffd93ed am: 640979eb7d am: 2329f21006

Change-Id: I4e2ef60f362a44ef07a477f65da74dac894276ea