Snap for 4651078 from a38afb24361aff213ea3cfd132948a3f93a5e691 to pi-release

Change-Id: I45af0ee641ade80a59d8891fb1148e7cb0cce197