Snap for 4539010 from 79b3a733036bc390ea58ca75346ff0dbeaf4bf89 to pi-release

Change-Id: I61ce75d5116c6ee27f32831c0ef3e0401ca3907f