Merge "Add strptime %s."
am: e09c90dec1

Change-Id: I58db9138370c86a1f1dad02a589cfd746d0d8d7a