Merge "Mark method as flaky while investigating further."