Snap for 4710485 from 1104b83feabf397002f38462690928ab1620e43b to pi-release

Change-Id: Ia2a32b5296edbe6355467f55e8b98f8ef54a317a
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/