manual merge of 37c0e274, fix building of otacerts.zip

Merge commit '37c0e274'