DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
am: 2026ca147b  -s ours

Change-Id: I17818101fa8f47d285cf772a0f67373c1dda5e30