Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7

Change-Id: Ia6595e18ac62862f8458efb0fc4523f64795d9ca