Merge "Fix AddAccountSettings memory leak" am: 104501fa29
am: c17b4e5a14

Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee