Merge "DO NOT MERGE: Disable failing test."