Snap for 4402171 from 55e0c71acefb11aab4f296adc1bcffb04e9ba120 to pi-release

Change-Id: I5afe14b7ce514ca943b0a1a4e917df9e541d981d