Merge \\\\\\\\\\\\\\"Fix corruption via buffer overflow in...

Merge \\\\\\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\\\\\" into klp-dev am: b5299033 am: 357e0f13 am: efa12724 am: e20f434b am: 63b7b724 am: fbdd8670 am: b528c30f am: 998e71e1 am: 14a05e25 am: 18b498dc am: b0b2bbaf am: 25d1b63b am: a27b5792
am: 8df93626  -s ours

Change-Id: I97519121fcb5842a4535dcef3c80d8b822ae414e