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

Change-Id: I445fb76e38d34e2df74ff61cfd4b1ce6166a7265