Merge "kati: Handle MAKECMDGOALS modifications"