Using ItemInfoMatcher in place of similar interfaces and utility methods

Change-Id: I7337b819fe8f42f7a5a1481b5ed5d99a8cf583c4
6 files changed