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

Change-Id: I40a7e24b9e77c27a954ab4394b47ac75a4681760