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

* commit 'a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
  RRO: prevent duplicate system overlays