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

Change-Id: I713561fcfdf28250e406fc9d7b497c2b70b287ca