am 041d053b: am ea21ade9: am 978194c6: leave the padding on the backupkeys

* commit '041d053be51f08c21e3826d6fe51a5ff12adc905':