Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev