Merge "Reduce no-op notification log messages." into oc-dev am: 5e3fb57af8 am: 0346448a46
am: 1f2194c838

Change-Id: Id354e4e5868240ce87fabd57747b98381aef81f4