NB: This test will be restored later after having merged from a
more advanced topic branch.

Change-Id: Ic59e63f193c70cbf4ea47b6db12264fa302f5e64