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

Change-Id: I3b54ecc96fc467975cb7fbcbf5325ed8b339d6fa