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

Change-Id: Ia582d2d62a601a1bc6691d62a85c7f89fc733499