Merge "Document the strptime %s change." am: 66e49c0503
am: 22eb0a61dd

Change-Id: Ia25c3fc4f77618740b0703daa4017b11ef62e76d