Merge "Remove byte code offset from golden files." into main