Snap for 4773106 from f91559f1d4b5594ba14a57bcf40c4cf3ea502eae to pi-release

Change-Id: I1b1bbc647128615b0e6bc5d35e81943bf9fa3589
tree: cf111389352f8f01af8f7188af6db484e5456618
  1. tests/