Snap for 4434599 from 072af1f1974cd44b99ebc30e6282d47cd1f65d25 to pi-release

Change-Id: Ic36376a7c3bad1944b7358b8cb26441709b07614