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

Change-Id: I6835b0804b66ad0ee0ff682b29a728f3cceca0bf