Snap for 4545621 from 88415e9b3abeaebe26f78d187fda6a06ca305e4a to pi-release

Change-Id: I970ae22ec8d5714a1a4d7f529d7a4ac967b5855f