Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d am: 0890a4708e
am: a38cbfbd1f

* commit 'a38cbfbd1f51da95eb15063a2e7cf412fc1a0e93':
  Clamp start delay to non-negative range

Change-Id: I56a05ae6ba65508f20b91699f319de71641a7fd1