Merge "Fingerprint suggestion should not be dismissed until fingerprint added"...
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev am: 9e89d528
am: 872efe59
Change-Id: I73553ed862ed9cbd98e8c21bdb69b5d254e6eac4