Merge "GroupReindexRunnable: Replace lambdas with method reference" into stable-2.14