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

Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81