[automerger skipped] Merge "DO NOT MERGE: Disable failing test."
am: 3a54f81a36 -s ours
am skip reason: subject contains skip directive

Change-Id: I12f8e9a9d25eb37f19e939ce95d3b48c87d0d51f