Revert "Ignore two broken tests"

This reverts commit 1958a27d2471fa66cfdeb5933bdc264956c480a5.

Reason for revert: Reverted CLs that caused the test failure

Change-Id: I93d7f1d4f95eb4982eff2f81b28b813c99f3b0ec
2 files changed