Merge "fix a typo causing sensor event to be sorted in reverse chronological order"