Merge "Cleanup event request API"
am: 0acfa752fc

Change-Id: I854a0bfd96ed1559d2fd6013f9c43d703fde0138