Fixes to fit Battery saver mode

Fixes

Change-Id: I9ff4ce3fb90094a7ac31848146cd489acc3eedc9