Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-dev