Snap for 4590521 from afbad758fae6b74b4a739935341c224575c58169 to pi-release

Change-Id: I86b95518b7627e60e841932075d969cd84855572