Revert "Revert "Remove TemplateLayout that is not for external use""

This reverts commit 0111db7181471cbf0e2f724026dba11f92dbe5cd.

Reason for revert: Roll forward

Change-Id: I0a7642915dbf3b16115456ab9c264cf1acf93d01
2 files changed