Merge "Handle retry count" am: e74587af4d
am: e1e3dc3698

Change-Id: I22e6a5ca7502bec0d12b443652dd5c9c7a6b546b