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

Change-Id: I726c33176e1aa2023620a043a981a90f5a90b74b