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

Change-Id: I1af80ae660727f7902e98680c43f03cb7668682a