[automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964
am: b73e921a27  -s ours

Change-Id: I2f2b7830adb57bb638bd6058177132f2d860889a