Snap for 4598635 from 14420d1a408d6185a05f58be30696d57ab5d7ee0 to pi-release

Change-Id: I980be4c5ef24555ed3dee6ee19411c3d4f1d5ed7