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

Change-Id: Ia6c4dff02e148a8711cfbbf4b51cab68df11b35e