Snap for 4778776 from 4c325c809d643f32d9bb7eee7cd70668f75e32ca to pi-release

Change-Id: Ide1992b12f3fa8099994e7449d6c6d4fc0ddb16a