am 5269ef7b: am 3931f798: Fix cleanup (cherry-picked from ics-mr1)

* commit '5269ef7b87c6aa89d86e73f438363661f2f65a04':
  Fix cleanup (cherry-picked from ics-mr1)