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

Change-Id: I0248f3f77dead262ebf536a357514e0c998376f1