Merge "KM 4 test fix Root-of-Trust parsing"