Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev am: 1f361c2
am: 2a488fc

* commit '2a488fc54010a827082de2aa3d4308ab9ddbf30f':
  Wait for fingerprints to be removed (Partial fix).

Change-Id: I5f08ac6701ec12f4329e1974dd4acc15661f2966