Merge "Add handle wrapper to allocation listener" am: c2f1fc70db am: bf2b8162da
am: 20eea044fa

Change-Id: Ie83eb8e0d94c4e201b3a972394f8503e14ef4dde