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

Change-Id: Iefa0ef7811092d7ef2d9b3d5d0a20dd2cbb1bbc3