Merge "Fix issue #111747818: Use default timeout value" into pie-cts-dev
am: d38ec542c2

Change-Id: I13c0c23f12c6ab6b32b672dd0da9ff2d937651c6