Merge "Ensure start delay is properly scaled with duration scale" into oc-dev
am: 9057f846ac

Change-Id: I124f898f6514a80a0a21682f9f9c21b282e05dde