Snap for 4632767 from 63354d1597b8db8db2f9fb887fcf8de6e98acb70 to pi-release

Change-Id: Ide716960a6cd5ca4cd5e399b44f7cd68907741e1