Merge "Suppress chatty debug messages" into oc-mr1-dev