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

Change-Id: I5fabd7475f16a6c3e841d239c7957eeaf81aea49