Merge "Remove unnecessary @SuppressWarnings annotations in ChangeControl"