Merge "Invoke all other registered handlers only for generated code"
am: 3caf203854

* commit '3caf203854a9270eed6d2858744fc1f6a3f76940':
  Invoke all other registered handlers only for generated code