Snap for 4562879 from 68270cc4df9d462b53e4dd2e9395f698b792b2c8 to pi-release

Change-Id: I5ffbc5e70810e95384883db0aaa7d6ae3fc651fb