Snap for 4545621 from f7b09ce3b698818aa666049cb2a45d340841355e to pi-release

Change-Id: I3747d7513edd4a29d1d1c31d54c81efc7e2bab87