Merge "Log fingerprint unlock mode" into oc-mr1-dev am: 953a464dd1
am: d782922e92

Change-Id: I13cd5dc38c870ee512677fb7e92c8f6644c024a7