Merge "TestUtil: Annotate as @Ignore and remove fake test method" into stable-2.14