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

Change-Id: I8ad8b8a273b70345ac024e27faa1484fb06afacd