Year / Month zero padded

Change-Id: I7f823c7ed89d048dab938252c7377886d7aeea97
Merge "Year / Month zero padded"