Merge "Fix AddAccountSettings memory leak"
am: 104501fa29

Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86