Return agent/Demo.template to the Services.

Change-Id: I1edeb9c6060f42d7cf4df4a07b922da6fcfaa589
Closes-bug: #1263047
Cherry-picked from I1edeb9c6060f42d7cf4df4a07b922da6fcfaa589 (master)
Merge "Return agent/Demo.template to the Services."