am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string...
am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
* commit 'f23e3ea6':
Search all packages for a given type string when looking up resources by name