Snap for 4539010 from a48c6eb42244dc9070bce6670566f4823ff6c11d to pi-release

Change-Id: Id348181d274cf9ee8f099a5bd624897f5643154a