Merge "Revert "Remove unnecessary null checks in CloseGuard documentation sample code""