am b827c44f: Merge "ART: Setting up cleanup"

* commit 'b827c44f39f66fce600408f82988d6e154627ba7':
  ART: Setting up cleanup