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

Change-Id: Ib4906735405a633b8b3905761b51a28d39cf830d