Rename --poll to --wait.

Change-Id: Ib7862293ce63e3f7c5bb402c17b8bf0e5a8940ef