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

Change-Id: I077aab98854ec3d7df78b107518e0151be78a30c