Snap for 5180536 from 0eb2fd56a234e5f1279c2a401219646d9635f023 to pi-platform-release

Change-Id: I0ca34a611d4d9c22166b89a9e293da6318640f5b