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

Change-Id: I0a68641bab795e8488a4b74050ef8c182cedd02c