Snap for 4638586 from abcbf8222e3eea8d6e6bc98a5552b7d11490b131 to pi-release

Change-Id: I53a9a50f1dabdd6fb054eafd8ea890c0bb4ccb76