Merge "New uid for extractor process" am: a3548a21ca
am: cda3bb5b93  -s ours

* commit 'cda3bb5b93e72f34df8e00c37544d0d632e1b192':
  New uid for extractor process