Merge "Fixing default timeout constant" into rvc-dev am: 7697d0f3 am: 1b701701 am: 7604cf33 am: 9e9cf230 Change-Id: If55ed8a20adcd2c4091771205f84d3548f8dc683