Merge "Account: Fix the risk of sqliteconnection leak" am: 766f0a4981 am: 130d5e3915
am: 28c72b43d9

Change-Id: Ibcf49239bae44081d2c8e10fe05ad3f6a07b52a1