Snap for 4450504 from ff44b798b7e7a0050eeb3f672d17431db533d462 to pi-release

Change-Id: Ibba905f9b4498d8b4d2a40a7d7bd5b4d432ab5b4