Snap for 4778776 from e7d20bcd4ccb7cf18aac77fc0d61e97cfa4817c7 to pi-release

Change-Id: I0743765c0f21d6c46ef7759f75956dcc5aaf3c1a