Merge "Reduced the retry after disconnect delay" into oc-mr1-dev am: b70a55a7b5
am: f6b28f0b06

Change-Id: I79a4126a0ccc7d80029d133180afce2ea9ad8b88