Snap for 4620899 from 0aa61f9e866945145bf3dc21c1255190dedb78ef to pi-release

Change-Id: I4a2907f8873b85be7db0de52caa1fa74a5af52b3