Merge "Fix benign unsigned overflow in AuidoTrackShared"