Add support for branch REL1_22 and update exceptions

Change-Id: I13a588b71652fd6ad1130de92c0beecb50b3d162