Merge "scm-mpu: Add additional memory protection options"