Merge "Ensure automatic battery saver won't stick" into pi-dev am: c1203d6a96
am: 6e7625b0e2

Change-Id: I96ddca3b28561b2d6c52b35ca8bc1ff590cd9533