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

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