Merge "Update severe (5%/1 hour) warning to send through battery saver" into pi-dev
am: 3d91fa44b7

Change-Id: I65fba59ca8779c2edc8102ff09ba800dfd85bda0