Prevent concurrent extractions am: 048fbf7ccf
am: d1d6bead7f

Change-Id: I376e6171ef80d4455498871035bf32a626dcf0bf