Merge "msm:cpp: Fix for spurious interrupts from CPP hardware"