Snap for 4713750 from 44fd93d0d31a45cd167047c528de07b06a7bde12 to pi-release

Change-Id: I1e2fab45474b14df3311195d32899f349a0df23e