Merge "fix(mpam): run-time checks for mpam save/restore routines" into integration