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

* commit '3d221a4b5a0f89800e453f6b4d6f8182669d8081':