Merge "Always check prefix matches array at each node" am: 385ea22741 am: 0b75d1987e
am: 249e392dc1

Change-Id: Iad87ee2da9b78b20146d1c8798677535fc3c2f70