Snap for 5600800 from 3a827b0a882258d291b67edbc5480e0ba0aedb39 to pi-platform-release

Change-Id: I507fd16c59236a9fd0f69db82876c3cb4f623f4c