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

Change-Id: Ia387bc54c8d51975aa4c938616a43e47cb3338d9