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

Change-Id: Ie419693d54932fc514461a2640e0611ba6f3b607