am 06e74b30: am e0f76e9a: Merge "Fix transition being canceled improperly."...
am 06e74b30: am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev automerge: 7b042be5
* commit '06e74b30':
Fix transition being canceled improperly.