Merge "Fix android.util.CloseGuard sample usage" am: 7381525076 am: 66b0e7d150

Change-Id: Ieec4a553744be7148938ee19cce23371597985e6