[automerger skipped] Merge "exclude broken test from presubmit" am: d7cf7f4f02 am: d0555c0132
am: 5b9d3a91b5  -s ours

Change-Id: I342c66cc34bf3072fa626704bd635b7610c766b7