am 16bad29c: (-s ours) Merge "DO NOT MERGE Fix account list for group editing" into ics-factoryrom

* commit '16bad29c54ae19018d30f4f07f6b487510969f32':
  DO NOT MERGE Fix account list for group editing