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

Change-Id: Ia584018aa779169a759cf3387e26072059f768b5