Snap for 4813226 from af6d94db84fbda7c9243cbc193d8e8e0290ac11e to pi-release

Change-Id: I9ee9ee6a07297044092c283f18871683635d6041