Merge "Fix to hide phone number printed in the log"
am: b967dce9d9

Change-Id: I35e01adb03db4ea01d7a37f94a0f9d21f45eecca