Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev am: 9e89d528f6
am: 872efe5914
Change-Id: I73553ed862ed9cbd98e8c21bdb69b5d254e6eac4
This commit is contained in: