Merge "Expose CloseGuard as a public API" am: 4314616565 am: 37f8e04de9

Change-Id: I42faa5840cb92a7c5c549e41f5cb03660165d9f4