am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev

* commit '04db979728ce0c2ea67c5ac5d7a1c2f02f53863d':
  Suppress phone number from logcat.