Merge "Rework battery saver synchronization logic" into pi-dev
am: 869c6f559a

Change-Id: Ibd889ec4d997969959e301eb0e23e1a3c58908da