Story 1522: Table of contents

Change-Id: Ieabe8f7071696cde6afbdc6df853aacdb741a4a3
Merge "Story 1522: Table of contents"