am dda5e898: (-s ours) Merge "DO NOT MERGE - Add Sampler custom alloc/delete"

* commit 'dda5e89800e781ff373bad575e3f2a4af68ec03b':
  DO NOT MERGE - Add Sampler custom alloc/delete