Merge "Expand a little on the time_t situation." am: 071d071646

Change-Id: Ie8ad22c1ba0d0cd406d083894ad9f1a4ef620ccf