Merge "Disable a phone number log for user build" am: 18f843be39
am: 2092b19393

Change-Id: I4beaa991d82b9f795d517ba2495a9ec60f81abcc