fix some issues with clearing the product for a job

Bug: 1022333
Bug: 877344
Change-Id: Ida838fb2f46fa92aa4c5613b241494c992881d8c