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

Change-Id: I4ee9f166508b4aaa2b99935e3dbc4307b18a7b0f