Merge "Mark 3 tests as flaky." am: 1566e18657
am: 49e64d2333

Change-Id: I6e33cfdfccbea43eaf36bd6a97098de523e31d33