Snap for 4706961 from df1ffe70debe7a8a1804d0d76607265d9958d677 to pi-release

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