Snap for 4620899 from f0e1bcb997be93752d1fe081f14b295ead657b12 to pi-release

Change-Id: I02b3e73347e7f29e525190033b0684d23b1040d8