Merge "Temporarily disable flaky test."
am: 775d11c988

Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b