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

Change-Id: I3bdb1f9389bc40f01ec9bf990f70fa26609afdb4