Snap for 4693621 from ec60f563edc96a023c2d997df6b769af0dbc705d to pi-release

Change-Id: I844f576244a2f7e953abf600dcd2d92152963e85