[2/2]Make squasher compatible with Jenkins

Change-Id: I6f4b09724f82849f8978a63557f8940aa6577ed6
Merge "[2/2]Make squasher compatible with Jenkins" into kk44