Merge "Suppress phone number from logcat." into lmp-mr1-dev