Merge "Do not hold locks when calling getAccounts" into oc-dev