Merge "Add trackingBug to heavily used CloseGuard APIs."
am: baaf8aac2e

Change-Id: Id38cd1ef6443ec0b625d6e5ef30793156cc23ee2