Merge "don't interpret milliseconds as nanoseconds" into oc-dev
am: de12503268

Change-Id: I51eb680e3e966577e30647b6529e900894da60c4