This is a manual replacement for the disabled automated cleaning. Depends-On: I909aad89bb18bb416e9749395970617d45b247ee Change-Id: I8e7f9b1122ff697adb4538233242c7b48420b17b