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