Merge "Add filemap events for iorapd" am: 07a00655fd
am: 2aa65842c1

Change-Id: I254760cf6fd79dfefb23eae12c6f4fcaea743312