Merge "Add filemap events for iorapd"