Snap for 4813226 from cc08faac6b309a1acc9a4eb8c28c3fc9669f8771 to pi-release

Change-Id: Idc6f7ba66fd72ccacc81822c91e06d3966429c5f