Snap for 4402171 from c66e7777b8ff9dae0b8399e0cb61cb5ac74fc5e9 to pi-release

Change-Id: Idd8f4925022dfa0893c4329f15c82ced5b8ff6af