Merge "CloseGuard: Fix JavaDoc code sample to use correct API" am: 88d4019b82 am: 87a25e33dd am: 363872235e

Change-Id: I615b0718b938185d9fa721c173d2bf0af3fc61d5