Merge "Add trackingBug to code used by tests."