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

Change-Id: Ia5996291c99df58d5986195424ce98ea354e6a8b