Snap for 4459973 from a2516840c8b010ae5176680877dede3d34e135df to pi-release

Change-Id: I03130ea80fa1574f41603682076993e919289021