Merge "Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d" into nyc-dev-plus-aosp