Merge "Adding CloseGuard.setEnabled for StrictMode integration"