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

Change-Id: I9ae73021bdb25f0a8656a5429aaa49bb91d5e04b