Disabling tests not passing consistently

Change-Id: I1fbd09d0885d65970681e7757a3eb060bfa06fad
Merge "Disabling tests not passing consistently"