Snap for 4496165 from 8a7e9871bb4055b1e97c06ea81b56ea6d21e1790 to pi-release

Change-Id: I99d39bac3a80fd7036be6bb033d41d1f63ec0ad8