Merge "Fix incorrect leap year logic"
am: 8b5eb92120

Change-Id: If9c70bb913abb8ef8a1dbe140ebdcbf24d2d87cf