This is a convenience function that does an unnecessary loop iteration. We have a hash table to perform the exact lookup needed. Turn the function into a simple wrapper which uses the hash table. Change-Id: If91976a955dea80e882656849b0b13d426e5748f