Snap for 5180536 from 3f3ff1aca3ec4d17fd0e6a0d3f23108ddcc95134 to pi-platform-release

Change-Id: I32ef7c75500029c00ab7acd14cbec5b885d73724