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

Change-Id: Ibbbdb78d8c346191b0baf10f99a6b954d606370c