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

Change-Id: I0af254a0e04c093df8aff56489954f2c60f3b305