Merge "Fixing default timeout constant" into rvc-dev am: 7697d0f3eb am: 1b701701e9 am: 7604cf3311

Change-Id: Ia8a5b9184d3eef7084f1ef3d4f0bbd7e0dc989b2