Snap for 4496165 from 260dfffd16a180ac1d278b6bb43d8fefadbb7460 to pi-release

Change-Id: Ia9cc56423f89175b65b09881de6d4e5edbcc85be