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

Change-Id: I8e4231b1ff62ddff7460f2b731bf1ffe7fca0849