Snap for 4807121 from 7321b5dc86ba9f9de31588bf726008bf8a13138a to pi-release

Change-Id: I71b3affe76a6e5ae04dc04229b4d59afffe160db