PowerSaverManager (2/2) - Squashed

Change-Id: I58a57f049b54e998c4f9a58f2e12d30d3fa5fc9d