Snap for 4422293 from 395b02098ffb93b2ea7611839099180a6db64bfb to pi-release

Change-Id: I960ea968a3aaff7417faa744a03c2af36b279ad3