Merge "Deprecate incorrect year constant"