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