Snap for 4496165 from 0e278f66e4f158023700ee0186bc565e6db48d2c to pi-release

Change-Id: Ic480b4ab3cf3e7d5d233c8de0e11bbbfa1394d32