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