Merge \\\\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187 am: 14a05e250c am: 18b498dc4c am: b0b2bbaf87
am: 25d1b63b7c

Change-Id: Id5f04aafe8ffff6ea462c9696a3c477875a29fa8