Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 303e9bdddf

Change-Id: Ic8a461333b73f9bcc51480aea0387a4573e2e2ef