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

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