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

Change-Id: Ie2ffc66d41bd99d55f4f348ed7715e3638b4d9f2