Fix build and a few updates for Battery Saver Mode.

Change-Id: I8594ae9bea27a794153717850290dbec121eb744
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>