add closeWatcher opts

Change-Id: I6693fd631e4417b1a1b7651d999a1245d005da97