am b10178f8: am d640ad2b: Merge "Don\'t use the legacy phone picker" into mnc-dev

* commit 'b10178f8ab275061ab267efe562185186c8a5f6f':
  Don't use the legacy phone picker