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

Change-Id: Ieb1fe032177827720b28ccec698e0743c5934235