Move to non deprecated templates classes.

Change-Id: I54561f5ad5b7cd7726c0e5e1863a0603f46d7dd8
7 files changed