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

Change-Id: I0c1bef7c7b436dcee5dfc8a06e8141f7757d7199