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

Change-Id: I5afde9dc2458faa384593ebf2f81b80e88809129