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

Change-Id: Ic46dc45775c788b89d298160871d2f60027470fd