Prevent concurrent extractions am: 048fbf7ccf am: d1d6bead7f am: bf0f4b6a08
am: ce9f080ec7

Change-Id: I01b673d1148d88a9cdc25c305b6efa5821228267