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

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