Fixes to fit Battery saver mode

Fixes

Change-Id: I2b4ccc094f58f70f35d735b5650f35aa43027c90