Allow setting # of retries in the binary

Change-Id: I7ef4f1f86cc6ea4937043ea7bf7d9526e23bd2c7
Merge "Allow setting # of retries in the binary"