Consolidate M8 pages

Change-Id: Ief75bb8644316d713b9941c2e334bce7b8b513e3
3 files changed