Merge "Deprecate incorrect year constant" am: 9fbb152eb2 am: 2b446998a1

Change-Id: I26f759d358c273657f0a0eba180968463e46ac44