Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b  -s ours am: 501ed9d  -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3  -s ours am: 1be8671 am: 8644100
am: c716312

* commit 'c7163126748cd3a18de5ab9d424a064dd081b750':
  DO NOT MERGE Verify OMX buffer sizes prior to access