Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am: bff14ae56f  -s ours am: 602aa57cb9  -s ours
am: 6790df9a90

Change-Id: I0a579c43358eda1ef9e924bff52af12412f17568