Merge some chapters

Merge omechapters by topic so that each chapter handles
a topic completely including case studies.

Change-Id: If1a465c556e3be3ae775e7c8a88bf5b413aa2de9
Partial-Bug: #1341836
Merge "Merge some chapters"