am a1487347: Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb

* commit 'a1487347f5ba24648303bf8c9e455ca2ef0de7ea':
  Fix bug 3362446 - NPE in legacy menus