Snap for 5180536 from 84fbb75721e04ca207ba4e29dd3120076db066f3 to pi-platform-release

Change-Id: I4f256abbad0d8c7b373fbb67f78752053ecf42c2