Merge "Harden drmserver process against fuzzing attacks" into mnc-dev