Snap for 4665332 from 08337c9f171886559f02468a3afb5a7a49979aad to pi-release

Change-Id: Ic1f6e33730c4c2b940be0dca8a57e992fa027dc1
tree: bb51144082551acfb9fdfb0b1d47f8f9c972a76a
  1. tests/