Merge "Increase num tries before failing." am: 4a8b288704
am: 6ca10345a6

Change-Id: I8f3afc63339e45d78b11b216613973fb1b289e2a