am 36b685ff: Merge "Fix for issue :  3419353 Crash during transition generation" into honeycomb

* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
  Fix for issue :  3419353 Crash during transition generation