am ed2905ca: am b77ebc0f: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e automerge: 633928f

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