Snap for 4610834 from fa9807d8a78cbc515be18635c74f9df19cdce3f1 to pi-release

Change-Id: I9f6f4176611f1095d89de0242fe1ac0bf77106c4