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