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

Change-Id: I4737fa1dd54600f276ce90d3a04dbbd7cebe7f54