Merge "Disable a flaky test" am: 932dda858a
am: a0535327df

Change-Id: Ie1fccb536e6df45491139ead179e8f5c2127d98f