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

Change-Id: I75be5b85e627c1533d52f1362abb6e679ed4af24