Snap for 4778776 from f5aa1413d5f26437a957d575e8060770889a5f59 to pi-release

Change-Id: I232df395ff0afd571e6cd5d30973ca6be41713b3
tree: 9ea0fb16bc1473e1daa683b6e9e3be09403afc41
  1. 28/