am bd7c7736: am 597e4df3: am 70f2f9de: am fb9c5391: Merge "Change Settings name to "Phone"" into mnc-dev

* commit 'bd7c7736518c8f4393b6a66824b0ead175d15d78':
  Change Settings name to "Phone"