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

Change-Id: Ibdcc9f6bd0cf56d1c89e6afd57f79bdd968f6c62