Merge "Add a method to test EventFlag configuration and usage" am: ac7f1d21e8
am: adbae29ef1

Change-Id: Id9e61c930e70073c7c543fb29d07a4c8c0d763f4