Snap for 4579913 from 3a2c61eb305c759429be8ea4b535767abe789373 to pi-release

Change-Id: I84771daa4c98629b157ab3e634bf659be20b52e3