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

Change-Id: I98897510188c38309f708d86802f83ef3573984d