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
am: 51649da59b

Change-Id: I36a82119ee7e7aace1e42d44a208432a91b68610