[automerger skipped] Merge "Update severe (5%/1 hour) warning to send through battery saver" into pi-dev am: 3d91fa44b7
am: 2bbe8e992a  -s ours

Change-Id: Idb1f5bea8a0ae79d066ba94e926baae1275e5c2b