Snap for 4531101 from 35defa0413fdaed29c791ed3afa41db78a90858e to pi-release

Change-Id: I0670d2a7420072ce5e1e7a2f140fd938ee19473f