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

Change-Id: I1f182d36fd09d4f4ed4328704a3a9ce16a2a1689