Temporary fix to process ODIN-2.1, add catchall handler for exceptions.
Temporary fix to process ODIN-2.1, add catchall handler for exceptions.


Former-commit-id: 7410fff4a1d3521fdcc82cc77c03a1b380f0e108
rgeorgi/intent