Changes to make Battersaver work

Change-Id: Ifab3eedbe5c1076019c1dcee25544ede6555e4e3