Snap for 4425573 from 9eb4884e078053d763b768b858841ec8c3502b7e to pi-release

Change-Id: I32447451cfd4aa4878c1e5c3f1597db73a095139