Merge "Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3 am: 954479e6 am: 50f5fb01" into rvc-d1-dev-plus-aosp