Merge \\\\\"Fix corruption via buffer overflow in mediaserver\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16
am: 63b7b724b0

Change-Id: If438c59c09568b57a0348f42bdc112d4613a3f8c