Fix broken Glance cleanup context

Change-Id: I1e75b141eb5b139b6cf1749e5ffc41c41fc89565
Closes-Bug: #1306801