Add changes and CleanTrash.py

Change-Id: Ic986748657f45ea3ef221636666fa05b8be919ec