Snap for 4551672 from 7efc77216ead495bcfe4504be9040cb8a8b284ca to pi-release

Change-Id: I12160ed8cf96a2923565f670b3d501a956ce929a