Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29 Change-Id: I6b17db774de6fa8be0bf944516a44ba73b10cabb