Snap for 5674421 from 571e1749add580573f41438e6b2128ecf27998f2 to pi-platform-release
am: 86dffeb53c

Change-Id: Iea5ee0032de2dd6ddb56efea6fae8e79ffd7fab7