Merge "Deprecate incorrect year constant"
am: 9fbb152eb2

Change-Id: I5623253402d980b8c105b4fa7a4d622067eaa7fa