Merge "Add strptime %s." am: e09c90dec1 am: 4d6ae117cb
am: 717d40607c

Change-Id: I064eeb3c811b0b4607ca3bee33170849114c53ff