Snap for 4585119 from 158e893f17499594467564a96868e19f07dfa722 to pi-release

Change-Id: I5a7e873010e17c43ca7c5f3b41eac61c09ce6bdf