am 9d9c7410: (-s ours) am 44c4e3d9: Removed usage of deprecated ic_dialog_menu_generic

Merge commit '9d9c7410b66391c7a7721958631b9650dd7c3a66'

* commit '9d9c7410b66391c7a7721958631b9650dd7c3a66':
  Removed usage of deprecated ic_dialog_menu_generic