am 3ebcd865: Merge "Fix endTransition index out of bounds exception." into mnc-dev

* commit '3ebcd8654d92da375e7ca6c74b4ba9dc6bb9ec4c':
  Fix endTransition index out of bounds exception.