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

Change-Id: I6e565af0ec462e57ae38f0c4f09b8c52bb5c6ab4