Snap for 4473011 from b0c793cc049ffc6c6590f9aeddaedf194105095f to pi-release

Change-Id: I583122e00bf11f42fbd5699a8ec8166a217004f6