update test_adapter_matcher

Closes-bug: 1396393
Change-Id: I400e914557a4c9f115127365da51e3d6314dab77
Merge "update test_adapter_matcher" into dev/experimental