Regenerate code with new templates

Change-Id: I66de7159320a57f6c66fdb2895d178ca76d491ab