DESCRIPTION

wip: proper cleanup

Change-Id: I1e12fa233e543ab38e153586d11a2af83a15383e


COMMENTS

author: Natasha Sullivan
date: 2015-11-10 11:48:06.190000000

Uploaded patch set 2.

-------------------------------------
author: Gerrit Code Review
date: 2015-11-10 14:39:48.565000000

Change has been successfully cherry-picked as 54ae18bfb9be24ff0bdf638c0c78ebfbdb919567

-------------------------------------
