Snap for 4545621 from 8daa00e0cace825d7a7362137c2ce283dfa3fc19 to pi-release

Change-Id: I5468501d44b40b106aa536c009d4035584f0fd9a