Misc cleanups and avoid logging PII

Change-Id: I9f906dabe0dd00a434ff88878f0639c835b2e2a7
1 file changed