[1/2]Make squasher compatible with Jenkins

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