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

Change-Id: I542161689607876e53beff3b0025cb9bb306181a