Add support for invoke deserialization to Cpp template

Change-Id: I8b5bba17b1b89aa33f8a76ae2016f87ca63c25fa
Cleanup cpp templates

Change-Id: I11b4cdb5ec4057e56984da9ef513c7e431305863