Merge \"Fix corruption via buffer overflow in mediaserver\" into klp-dev
am: b5299033ce

Change-Id: I774cb0256be49317851488879221a1c3602148f3