Merge "Update icon for battery saver conditon." into pi-dev
am: 89e0287711

Change-Id: If5b81203ee4cbf691b236f79f71213f8252ac873