Merge "Fix Date.toString() behavior / tidy up comments"
am: ea112e6d54

Change-Id: Ic2358e71a9ec686756891d03a22c085ab716bf81