Snap for 4670666 from 0c4576e097e851931e2edc42fc5d096941216f95 to pi-release

Change-Id: I99721350fd1cd61b3e9aba5ce431e2a8f99ff84e