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

Change-Id: I43b77614b0ccdd573cf8b29b08ef518bad617aff