Merge changes from topic 'am-88e315b4-83c2-4988-86ba-c88cca595c64' into ub-contactsdialer-j-dev

* changes:
  [automerger] Stop using deprecated methods. am: 0e6c80e140
  Stop using deprecated methods.