Snap for 4722539 from 14f29eae899621893fdb9051e52522386a510f49 to pi-release

Change-Id: I5dc42ef15b4865d99aa5f98086d8a59ae0965cad
tree: 126f483575764b5a0cd43a10333ed6d240ad7d8f
  1. tests/