Merge "Remove unused include Util.h."