Merge "Fix formatting around rkp-vm tag" into main