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

Change-Id: I6b16ee85bf321bbda9d53670314926f621168b95