Merge "Disable D8 for a subset of the tests"
am: 8cdfac7528

Change-Id: Idb9d2fb061451e2f9490d0feaafcd3176e11ef17