Snap for 4459973 from aaaa1fae13a98db2b751ba7717ae5ca46d1e2688 to pi-release

Change-Id: If41c01d0e914b3051572d63648d882e9e4905aa9