Snap for 4784261 from 0326efa05c2b05473c810aabe4e5029da91dae9a to pi-release

Change-Id: I088ef6fe963c40963c8c62e4d5ba74976e640c99