Prevent concurrent extractions am: d89431ead3 am: c094a2de01
am: 1d40f0ca24

Change-Id: I0af420be82ad7eb5ad5db742e5317d1e2cdd0fe3