am 89492190: Merge "Runtime resource overlay, iteration 2, test cases"

* commit '89492190b39e301d8203d0a9a9f6b11120c16ecb':
  Runtime resource overlay, iteration 2, test cases