Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am: bff14ae56f -s ours
am: 602aa57cb9 -s ours
Change-Id: I62c9c5e8edec52feb8bbd680a2206feda172e133
This commit is contained in: