Merge "Add back menu discard string" into ub-contactsdialer-a-dev
am: aefa271908

* commit 'aefa27190861f8a1e09a5c140a4e2ad935520954':
  Add back menu discard string