Merge \"Ensure we pass correct values into the next transition start bounds.\" into nyc-mr1-dev
am: 7a07477cff

Change-Id: Ic9e75c9baa9eeaad5c870f8d9a9da843eeb96371