Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
am: f516251453

Change-Id: I9ec51f68442b2352f98238e70641b041dd94725b