Merge "Improve dex location canonicalization-related performance." into lmp-dev