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

Change-Id: Id4b363cbc598587f5a37b1d4da30f3f6565a69f7