Promote a few tests from flaky to non-flaky

Change-Id: Id5933de0f6f12d2a6619a0e59d71461bf410b4e7
Merge "Promote a few tests from flaky to non-flaky"