Revert "Revert "Re-enabling a couple of tests""

This reverts commit 9d8c7871fc2814ec6f13dfb634bc08f8681fb749.

Reason for revert: may go away after b/282110579

Change-Id: Iccffb3794c43de48e90196213891644b46d2869b
1 file changed