fix copy/paste errors on menus remove dead menus Change-Id: Ief9e357f09b61a1f068bfbdb78691a7293b96552 Former-commit-id: 9220aa63ef9b99a1991f6c9cf14fb4e958da7d87
Change-Id: I58f76a59a40170fefe93d779760b6581c3f8490a Former-commit-id: 4554ba073c7a97a335d8020f7068bc5521c0b47a