Close fd if polling thread is disabled am: b86e9b0b63 am: c7fea61005

Change-Id: I7164d52d95b2f3987b226880e5f14e8ea231cdcd