Snap for 4507345 from d44f46c37f1c5226477c13c39ebfb438d8f262eb to pi-release

Change-Id: I108d0956368eaed64040c8f2c3103057a0db8857