Merge "Fix incorrect leap year logic" am: ca13216bd1
am: ef56b49dfd

Change-Id: I815ad6a124dc7e9cc7a9ac3e9163f849711b537c