Merge "aboot : mdtp: Fixed heap overflow issue"