Close the fieldset tag for scaffold index

Change-Id: I480cb2569277ce5ee2dbf63cae557e39f74583e1
Merge "Close the fieldset tag for scaffold index"