Merge "Change ranking update aconfig flag to use main bug" into main