Snap for 4683893 from 8176b22e2dbf860191c08734de8b1678ccb5c122 to pi-release

Change-Id: Ib5cd3fbfe9a86dc55a2676b04568462f4c14b45c