add controller timeout

Change-Id: Ib76f2cdde5aefe298e5c65495eb601fd4036ea2f