Merge "Revert "Revert "Make WatchedFramePop instrumentation event pure-virtual"""
am: afdab8d7e5

Change-Id: I85f61f813d0e1b85382897e34d2b2e7b032c7a91