Fix derps in the battery saver cherry-pick

Change-Id: I35c3cec9e680292367abfb8c2cf5d4895b7735c9