Merge "Merge "Fixing default timeout constant" into rvc-dev am: 7697d0f3eb am: 8502b97753" into rvc-d1-dev-plus-aosp am: 40c5f7dbeb am: b9c9f51bd9

Change-Id: I493313a97085f0782188bcda62327e3b5c9634df