Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev am: faf37babb0
am: 04ccde83ff  -s ours

Change-Id: I8afa46a395b00482de07b81362acc76fd827edf8