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

Change-Id: I8d05ab8eda6bfc7a93013dcc8a85b31d26c8515a