Fixed flake violations

Change-Id: Ie643604ef84f9800f1a4fbf6c7c6f89cf96d48b1