Fix owner tracking

Remove TrackingClickListener

Change-Id: I8c86ddd4f6510d2d2951be7f841914a5ddcf0dc6