Snap for 4560043 from fa2f86bb33f45b6c771393015324e4ccf03fe977 to pi-release

Change-Id: I70aeacaa33fd4a50e6cb5db753bc8e579648658a