Merge "Require serialno field for brick OTA package on release-key devices"