Merge change 7572 into donut

* changes:
  Fix issue #1985606 (Boot crash when battery level of < 15% is reported) in Donut