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

Change-Id: I863f048dd4b95c0f9278fe8aefc432f852b82eae