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

Change-Id: I15aadca0ff577fb6038e1aa8e9e40964309f042b