Merge "Fix incorrect leap year logic"
am: 3a72cde42c

Change-Id: I1ab2acbd2c0b78fdfdaf95c0fffc137a1b2cce0c