Android O IOT Preview 7 (4635859)
Merge "Only construct waiter when we need it."