Snap for 4773106 from 44ac411683e7cfbfdb1f58e02d54377d709c8dd4 to pi-release

Change-Id: I5a98f52a42445a8a9cbd9e582612a57d1e277f5d