Change to trigger jenkins + associated cleanup.

Cherry-picked from 579656683097d664f6a3c12b31a95d791e5d92fd,
with minor additions.

Change-Id: I1c5db6958ccc4ce1c3fbd891ce7276ac1c2bbea1