Snap for 4793185 from e763ed2aa3075a1fd699f09c06ba67dbfd946a6b to pi-release

Change-Id: If756e11bbaf9d526a472fbbdf309520c3ef9695f