Merge "Reduce no-op notification log messages." into oc-dev