Snap for 4535700 from aa09516d427061ebc79800e2cc9ff3c07ec153d0 to pi-release

Change-Id: I88b7847e7dbdd9941b326d1d7768907f537ebbbf