Snap for 5674421 from dde88725074df266dcf66ae72c39b64e900663b3 to pi-platform-release

Change-Id: Id5e03d340749e8c5a89cbfb3e5b0fa1992036f26