Merge changes from topic "batt_mon_2_1_types" am: a1015599d3 am: 38ea0a061d
am: d8a7c8a62e

Change-Id: I6c4ef7ee2449df4a18b27ca14366dc6f3b97a081