Cleanup action added

Change-Id: Ic184bc5b66522ca91691baa07ceea0f838c9cabd
Closes-Bug: 1271079