Snap for 4613997 from 3a6eb091c03b76fc63e5b074b271ca582d11fc37 to pi-release

Change-Id: Ic9750478e71329787317addde9dc3f110e594d31