Merge "exclude broken test from presubmit" am: d7cf7f4f02
am: d0555c0132

Change-Id: I8b1ddd4425df56b8f44022040160db3fee9f0a67