am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev

* commit '5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
  Wait with finishing until fingerprints are removed