Merge "Merge "Reduce excess local prefix computations" am: 35d9291ca7 am: 069fd8e996 am: 7b86429051"