Merge "Refactor location event log"