Merge "msm: cpp: Ignore hardware interrupt when timer expires"