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

Change-Id: Ia3596b558fb09600e7d9a16f0dce03d4402ee653