Merge "Update battery saver string" into pi-dev
am: 7f0690d59c

Change-Id: I965052d86913b7848610fb65b514a2be6157728a