Snap for 4535700 from c30fbc9dd547f6f43f94da8272151aa83e4ad929 to pi-release

Change-Id: I4aa7aac20f9fe91b9e71398deb20b0f224200826