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

* commit '75b75cca1bc2de506810fa78bf0349df263b6d30':