Snap for 4647811 from f6c74202c6422a03dc03dd4bfaf7f30a97de7d17 to pi-release

Change-Id: I4b2046067d7e24b6bffdaa592a878ecc776395a2