Snap for 4410151 from 5957588dbb2c76b8112bc05a04cf68e7a4c530f7 to pi-release

Change-Id: I2c898a58b02b8fa926419f5efe4358aa58fc7db0