Merge "[OneSearch] Add packageId as an int for latency logging." into tm-dev