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

Change-Id: I8bad789f43c6f73d2b3eb9854ee2e2c4138871b2