Snap for 4683893 from a89c832fc02e57f678731860cd6059aac0535d85 to pi-release

Change-Id: If55a2805ccbdc1b4200f12ffd46d50a8ba220cdc