Snap for 4784261 from e9a39e2714c7311fb88b38f509a96764671dae96 to pi-release

Change-Id: I917ceb3a8ce299ee13b22bb546a6319dc3b9dfe7