Snap for 4824048 from f131154914971de975b258985190eb255574e477 to pi-release

Change-Id: I65b545d98813c268ab0bbc7fe51243c49eccedac