Merge "Format the template using HTML tags." into nyc-dev
am: e071d11592

* commit 'e071d1159277a00e0484dbf43899bc90ea27176c':
  Format the template using HTML tags.

Change-Id: I1858bc3c1e6d6fb5f4b37a2ef4a287de635045ae