Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
am: a7272b4cad

Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb