Snap for 4590521 from bccc0c9bc191e16560be107c78aa2d685e9077a4 to pi-release

Change-Id: I116476f97f11277370bd552b2478760881ee4b81