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

Change-Id: If55ed8a20adcd2c4091771205f84d3548f8dc683