Merge changes from topic "batt_mon_2_1_types"
am: a1015599d3

Change-Id: I2c28dc5a6c726d1244cefe0e273c272435d01351