Merge "When file sha1 populator fixes wrong values, make it fix the other metadata."