am e849cc1b: am febf33fe: Merge "Fix resource-loading code for TransitionSet" into klp-dev

* commit 'e849cc1be608d672d318c5b7e56857ebe296de52':
  Fix resource-loading code for TransitionSet