am b2228eb7: Merge "Runtime resource overlay: clean-up."

* commit 'b2228eb7141354089f974a4db3b5224a0ad75fd4':
  Runtime resource overlay: clean-up.