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

Change-Id: I60c83cf4ebf829ede96abcb22ad94af1bf891260