Snap for 4670666 from ef98c6934284e304ff04d6d264cf02fa2c1e2ef2 to pi-release

Change-Id: If7dba53be99662fdf5477dc9bdeb33aa94c4cf5e