Merge "CloseGuard: Fix JavaDoc code sample to use correct API"