Merge "Advance Kernel to Build: 12228015 (6.1) in trunk_staging Cheetah" into main