Merge "Disable a phone number log" am: 44c11b854e am: 467525fa3c am: 87c3705de3
am: b7743a2829

Change-Id: I5cde85947786e657f62972811dec199d4a288c81