Snap for 4517567 from 7d410e27e30bd441b13bee1186824a2e9341509c to pi-release

Change-Id: Ifed061c17379c7acbc8befa4cba64ab6de9595b4