am 484c7dec: am ba46260f: Merge "Runtime resource overlay, iteration 2"

* commit '484c7dec798c8ba068f282d1d4398bfdd9b634d3':
  Runtime resource overlay, iteration 2