Merge "Increates timeouts and add a retry rule" into oc-dev
am: 5557806fff

Change-Id: Ie2ce415355fdd282ed285cc2b80989782c4582b7