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

Change-Id: I11e1cecac6701fe76bb102d9bb6f73bcc6ad85f6