Snap for 4402171 from a1c7dff157efe52abb7ade7f93d35dce82ca0d6d to pi-release

Change-Id: I43dbf5ed0233941be3150eca23b34dfa6fd9edb5