Merge "Make WatchedFramePop instrumentation event pure-virtual"
am: 3753bcdba6

Change-Id: Ib0a697df22cc4a5b762995265b6b2fdc296d13e1