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

Change-Id: Ic04a562f2c32cb0187713f2b661e35fb3f7f6023