Snap for 4807121 from 95d5df42e63c405a7e80cf551191a2d51b0421dd to pi-release

Change-Id: I4577abadba01d061f158ad0b95db835d2d6ac00a
tree: c78eecbc72bba4a3401c3cc184d50bd266ce5ede
  1. 28/