Snap for 4731145 from 96aae8784d90af371f3ba1896a85a0eeae34c34b to pi-release

Change-Id: I638e7035127cae31ed161effc09ead8fc9a0cebd