Snap for 4545621 from fe312e5acda719ceed5cbb9e7b33e9f8be1179d4 to pi-release

Change-Id: I05781810c9f1bee9129680e59ca81406f7937a71