Snap for 4731145 from 81d6b6cc359b064e879a47d05c49736731f054d3 to pi-release

Change-Id: I527e2ee789f4694570bf7b450c9eb91571ae6df8