Snap for 5674421 from 07f6e2d2fb3484a86337d6f32063c3d06c68cfc0 to pi-platform-release Change-Id: I97fc6dab8a292fc7bd8cea0627bc60a2c91679c3