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

Change-Id: Ia5b588a2b660078d155df7e28d0b2fad958d8267