Merge "Make thread safe when accessing AccountEntry"
am: 1329e4fb6b

Change-Id: Id188787eb006b2f861e08529de8df92fbc7d833a