Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev