Battery Saver master case changes

Test: visual
Change-Id: I473108b3c2e1a48e17416c33f4beab606abfab88
Fixes: 69481756
Fixes: 69481988
2 files changed