Merge "Remove lots of log spew" into oc-dev