Merge "Changing Slog.wtf to Slog.w" into pi-dev
am: 1c22ed2712

Change-Id: I526d9c1dc60be6dfaf2500e4ca1d48d704218d57