Make root context menu match spec.

Bug: 31345822
Change-Id: Ibec233cde74092ffe055639e97ed6946c5908c0b
12 files changed