Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev