Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
am: 9e89d528f6

Change-Id: I1ee72cec3e831652d1bae451b8c43d9d8032c74d