Snap for 4628106 from 3078d6a7cda697a5180449d414a8a7d9794b4975 to pi-release

Change-Id: I1a3384f0caee8b1798afba331c6d85c56940d56c