Merge "Temporarily disable flaky test."
am: 3fb5ba9e61

Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3