Snap for 4410151 from 7cb5c72a6aae791414f7cd08e05a5e02c8417089 to pi-release

Change-Id: I6c740dfff34757ee65e58aee510a3123ed69128c