Snap for 5674421 from cf70597f5c44bbae0a9aaa5ce5e7a60ea425f5b4 to pi-platform-release Change-Id: Ib017c4c5da30237c574e8e266860012af90385d9