Merge "Make thread safe when accessing AccountEntry"