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

Change-Id: I3e564e629e26c9a06cb076496ab1600c695255c9