Snap for 4824048 from 30404131f75131fba975b74981c0cb1231c96638 to pi-release

Change-Id: Icf4bc4a9dc87fac0d630d37c177341e9e0f6637f
tree: ba2dd1ce36412e1a4fdb4a37cb16d13dd9fa3120
  1. tests/