Merge "Use correct timestamps of events for logging." into oc-dev am: 2ca51820f0
am: 5618d79349

Change-Id: I5d79993e0e855501aa13b1afcd7af068eeeb3d93