am 0a4c2646: am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev automerge: 4eed340

* commit '0a4c2646f4b72fdc78299dbb3dd86a7aecefff08':
  Suppress phone number from logcat.