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

Change-Id: Id969c2685ca51086f412f46eaa3f89834710c1ad