Merge "Fix incorrect leap year logic"
am: ca13216bd1

Change-Id: Iebb67ebbd2e186f51ec6f08578e7c8dd1e10e528