Update templtate due to new form was added

Change-Id: I3a25f37c87fbae50d78ad3cfddf74ee1d767e001
Merge "Update templtate due to new form was added"