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

Change-Id: I9f196b866e8518c9fa0dd22ee5e2a7725130361d