Merge "RRO: Synchronize access to overlays.list" am: 78382db820
am: 1b9303e8f0

Change-Id: I3d6b143ffc5c08249e9a0be35c39b0e89b364c20