Merge "Use event time instead of System.currentTimeMillis" into tm-qpr-dev