Merge "Modify Jenkins template for aaf cadi & inno"