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

* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
  RRO: prevent duplicate system overlays