Merge changes from topic "health_charger" am: 056ffd93ed

Change-Id: Iea13df1d04d03ac4e8aac68d22ca87327df0919d