Merge "Always check prefix matches array at each node"
am: 385ea22741

Change-Id: I9d4b9d9587212061dabcba206a17e3f18176641d