Snap for 5674421 from 10102baf42027fe73f79d667c77a211e40101203 to pi-platform-release

Change-Id: Ib986355505f98c02519e28f1a6ddd83d5fda7df4