Merge "Verify OMX buffer sizes prior to access" into nyc-dev