Trimmed down lots of other battery saver mods[1/2]

Change-Id: I075074917fccd80dd756fc1e525f2bf75582ecb8