Merge "Fix scope for visualizer object release" into nyc-mr1-dev am: d5a6febfc4 am: 82440a78c9
am: 25658fd9fc

Change-Id: I665f8da713e0b3ebdeb822ede6784d1faa3da414