Make menu item title and help text consistent.

Change-Id: I8ee773c473873e5e4c3ea3dbcc0ec3e53dc2b91c
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1