Merge changes from topic "charger_props" am: 7cea50acd8 am: 958216c97f
am: d769c964fb

Change-Id: I418e543414bcca45ded619e42ef0500422049ef1