Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev
am: 716edf3883

Change-Id: I74463f481c599c0680c8c536eef12ac1f23e6fa0