Merge "Fix more issues with python3 conversion of build_verity_metadata.py"