Merge "exclude broken test from presubmit"
am: d7cf7f4f02

Change-Id: I33b4518d37ca53e65ff1f968320322aafb7d7fc6