Snap for 4560043 from d16d923716a4e54ca4c9003ff4b356705f1e10b7 to pi-release

Change-Id: I3dbb4070b5305750a92b11fcff70498f7a48d4ec