Snap for 4507345 from 7f7f51cfc3c0b07e477749b87083f1ecffcbfa7d to pi-release

Change-Id: I6cc21fe16c2562e592c17b43deefab14e1a51f05