Snap for 4706961 from 7fdb6355e4482da80c8e4633fc54a72380881965 to pi-release

Change-Id: Iea61f6f7d5d8b6f825a06d28b3a6f4d8ef7cbe38