Snap for 4551672 from ba2555a6c7f9baab43c7b39060761e0184732c72 to pi-release

Change-Id: I9f2244b5fcbb9b59f0bcebf9ffa547ec26a127bd