Merge "Only construct waiter when we need it." am: 1076d628de
am: a04143b130

Change-Id: I3ff33019a2afa1e02ffba37e212c09657e075d83