Merge "Mark 4 tests as FlakyTest"
am: 50242ce28a

Change-Id: I8b82c493e87eeea1d9f7fcbee79739a770e76aba