Snap for 4821244 from e1aa31860e1dfbedff375560e6d979497aef750f to pi-release

Change-Id: I053efc69799644c85948b724917274c99f3c98fb