Snap for 4751833 from ca4e5e87e5bf18698638b43a4b0a954e1f900028 to pi-release

Change-Id: Idaef846e750b317ce347711bdef8bc77a7921b6d