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

Change-Id: Ib627fa2d105a9df73edb86a0c631dfca1e4c1f9b