Merge "Merge "Remove unnecessary clean up of targets" into sc-v2-dev am: e59a4fee55 am: 02ab472cbc"