Merge "Refactored field classification workflow to not hold locks when calling ExtServices." into qt-dev
am: 18b19a0da9

Change-Id: I9409ca11b57f9826befc6cb3d4e0674e7f73e566