Snap for 4680594 from ab6dad11dea04ee63de0f6e89964a9e3abee4bb9 to pi-release

Change-Id: I48c8a277d7106b2e507e7280864d68227f7e34eb