Fix depercation warnings in templates for unatttended upgrades

Change-Id: I350395cce283a968c80de3a92d38b3594432a97c
Merge "Fix depercation warnings in templates for unatttended upgrades"