Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am: bff14ae5 -s ours am: 602aa57c -s ours am: 6790df9a Change-Id: I0a579c43358eda1ef9e924bff52af12412f17568