Merge "Use AndroidFuture instead"