Merge "Add trackingBug to heavily used CloseGuard APIs."