Snap for 4612226 from 4702f3aea3136e9e22e496d9c59bd9be491835ea to pi-release

Change-Id: I3a368c81aa7f487cc4a95197581746fb34b151de