Merge changes from topic "fdevent_refactor" am: 88d23135d2
am: d057fb5345

Change-Id: I2ba5e7e6b2de552f70bd7999cea7c5f24de4d2de