Base: improve powersaver (2/2)

Change-Id: I86c2155f8c3aa6301fc7a4c09ef0fdee5639da89