Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: c1e566a22e am: 2a2d8f2b89
Change-Id: Ia9f2c3b3cf604e7bd45913fea6ac6d4c88198662
This commit is contained in: