Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
am: a7183d4323
am: 6ff1bb5be5
Change-Id: I88a44c691b7548e7523397202adeb65f2a554e7b
This commit is contained in: