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