Merge "event interface going private"
am: 9fbeb7e4ad

Change-Id: I99a22ef01c797826f92e1b42c15699750c52934e