Merge "Fix corruption via buffer overflow in mediaserver" into klp-dev