Merge "Remove unnecessary @SuppressWarnings annotations in ChangeControl" into stable-2.6