Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev