Merge "optional cross-check between OTA radio images and board-info.txt"