Merge "Fixed a crash when dumping groupmanager" into nyc-dev
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I65eee546cb3bfc3b7f0a841eeb5e1ed333f696b5