[automerger skipped] Merge "DO NOT MERGE: Disable failing test." am: 3a54f81a36 -s ours am: a3a404bba3 -s ours
am: 4c9fe772bf

Change-Id: Ia01151feb45e911acdb966b9ad50a0a0a0270e55