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

Change-Id: I42f79dd854a98d8fe20e922a35db372b54fc53b8