This change fixes a bug in matching resolution. Bug-Id: 13729278 Change-Id: Ib3beb3a5f0c08abd7efa543f0f00a35190406371 (cherry picked from commit 9f95a10b)