Merge "Fixed a crash with autobundle grouping" into nyc-dev