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

Change-Id: I067a006032a73d646f779669db9dcf6a25020709