Merge "Fix the error in the podscontroller."