am c15b9ee0: am b5cf5330: Merge "Lookup private resources in run-time"

* commit 'c15b9ee0ad36bb9f9266de824a332e704f498e40':
  Lookup private resources in run-time