Snap for 4496165 from 23c8a128f2bf38b7fa7b5df69a2a059f78521e43 to pi-release

Change-Id: I1ffeb10c9d7ab9a4564fdbf1bd952b88a733aa52