some group and right messages are missing

Bug: 58489
Change-Id: I6bfc5395450fe14b2b033f4ca25c00336c76ecbc