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

Change-Id: I327671ad92b312cb1484d6433ac48497873f1497