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

Change-Id: Ib401377b8dfb5d423e0b249bc818e953d78fc752