Merge "Add handle wrapper to allocation listener"
am: c2f1fc70db

Change-Id: I6d1dd11cc78df41c40324c280757f66a0ac55c2d