Snap for 4706961 from c3dbfcc312774563c28f70c5c83c8bca5c894a9a to pi-release

Change-Id: I7ad2b8bfacd5035ad9d01ae3601c431c21102feb