am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"

* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays