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

Change-Id: I0c8c324477e46db6dfd6bc770d7154decb0d6276