Snap for 4620899 from cee5f1213d41f352ac54b1f437e6aadca12e81a5 to pi-release

Change-Id: Ib48ed1a4afdb6d9f3b0effc70d81a9b02ad2815c