Merge "Merge "Fixing default timeout constant" into rvc-dev am: 7697d0f3 am: 8502b977" into rvc-d1-dev-plus-aosp