Merge "Do not hold locks when calling getAccounts" into oc-dev
am: 6a841cb88b

Change-Id: Ie1d66b8e3a6dd11ebdea7b67756b9bf12581d5b2