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

Change-Id: I3c7271ede9cad2d55eba5afebb1fed8bedbfe494