Snap for 4725392 from a62adc603a01f5f7ae1e7c8b403d69486d3657bb to pi-release

Change-Id: I034de66f6b39b5dc2d90b3e3f2728da8a6fa7e12