Merge "Only construct waiter when we need it." into pi-dev am: 06bf7e6a11  -s ours
am: 17aa282d66  -s ours

Change-Id: Ib26a2d92d59d5cadca880ca4345a11c276c84d43