am 70b030e3: (-s ours) am d640ad2b: Merge "Don\'t use the legacy phone picker" into mnc-dev

* commit '70b030e344a4442e4f7022d3fe6e42c7501838bd':