Merge "Remove return of void method results"