Snap for 4807121 from 6e9b71e1d712c89553d170c3e935557a1e6ba82c to pi-release

Change-Id: I82b3ae9684a4ac466309cd23b2ffbaccf75621d3