ocg templates: retab

Change-Id: Id1539470e0882b7273b36a4855d70f73baaf65e6
Merge "ocg templates: retab" into production