Merge "Disable a phone number log for user build" am: 59a40691a5
am: d31314d550

Change-Id: I37620ec6876bba1ea0fefc018c698c3d490aadef