Merge "Add support for a hw_timeout_multiplier system property." into sc-dev