Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev